Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 15 Jan 2010 14:21:59 +0000 (14:21 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 15 Jan 2010 14:21:59 +0000 (14:21 +0000)

Trivial merge